build: Add --enable-selinux-custom-policy

Don't use this.

It's just for me, and only temporarily until this stuff all lands in
the Fedora (and ideally upstream) selinux-policy.

diff --git a/Makefile.am b/Makefile.am
index 803ce0aa27e535d2feb943f2ac6aa9cfe065bdaa..719dbd016a219f4aee12135d0c7057b387313035 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ endif
 
 SUBDIRS += .
 
-if USE_SELINUX
+if BUILD_SELINUX_CUSTOM_POLICY
 SUBDIRS += selinux
 endif
 

diff --git a/configure.ac b/configure.ac
index bbd9cbf604b586465ee115dae224330b8aa22a7d..02b03694276596a6f85962c77ea1b94115355849 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,12 @@ AS_IF([ test x$with_selinux != xno ], [
 if test x$with_selinux != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +selinux"; fi
 AM_CONDITIONAL(USE_SELINUX, test $with_selinux != no)
 
+dnl FIXME remove this
+AC_ARG_ENABLE(selinux-custom-policy,
+           AS_HELP_STRING([--enable-selinux-custom-policy], [Custom policy overrides]),,
+           enable_selinux_custom_policy=no)
+AM_CONDITIONAL(BUILD_SELINUX_CUSTOM_POLICY, test x$enable_selinux_custom_policy = xyes)
+
 AC_ARG_WITH(dracut,
             AS_HELP_STRING([--with-dracut],
                            [Install dracut module (default: no)]),,

diff --git a/selinux/Makefile.am b/selinux/Makefile.am
index 1d69949f257db1c868b1c986b27ae709f8c822cc..498f9df847cb83bb6a3eba652eb52136dba5b6dd 100644 (file)
--- a/selinux/Makefile.am
+++ b/selinux/Makefile.am
@@ -20,3 +20,5 @@ ostree.pp: ostree.fc ostree.if ostree.te
 
 selinuxpkgdir = $(datadir)/selinux/packages
 selinuxpkg_DATA = ostree.pp
+
+EXTRA_DIST = ostree.fc ostree.if ostree.te